From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 11 Feb 2011 01:32:13 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~15
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=26d0f968d95fee90911d269241c7ae16f39e6e1e;p=emacs.git

Merge from mainline.
---

26d0f968d95fee90911d269241c7ae16f39e6e1e